Look for expat in macports and source-installed locations. Via Scot Hacker.
authorrobertl <robertl>
Tue, 7 Aug 2007 06:58:15 +0000 (06:58 +0000)
committerrobertl <robertl>
Tue, 7 Aug 2007 06:58:15 +0000 (06:58 +0000)
configure
configure.in

index d51b46141c30ccb1ded4b40f02544fa7cc0ad6e8..c9152e91b677439b93bfdcb05c254fae2b832931 100755 (executable)
--- a/configure
+++ b/configure
@@ -4339,6 +4339,7 @@ else
        case "$target" in
        *-*-darwin*)
                if test -f /sw/lib/libexpat.a ; then
+                       # libexpat installed via fink
                        EXPAT_LIB=/sw/lib/libexpat.a
 
 cat >>confdefs.h <<\_ACEOF
@@ -4346,6 +4347,26 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
+               fi
+               if test -f /opt/local/lib/libexpat.a ; then
+                       # libexpat installed via macports
+                       EXPAT_LIB=/opt/local/lib/libexpat.a
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBEXPAT 1
+_ACEOF
+
+
+               fi
+               if test -f /usr/local/lib/libexpat.a ; then
+                       # libexpat installed from source
+                       EXPAT_LIB=/usr/local/lib/libexpat.a
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBEXPAT 1
+_ACEOF
+
+
                fi
                ;;
        *-*-freebsd*)
index 8cf8cf5e9acc00cbca21dfb2c381506ef597c505..b78e33a595ad39fb299b706e9aeddcdb8a67b4a8 100644 (file)
@@ -219,10 +219,23 @@ AC_ARG_WITH(libexpat,
        case "$target" in
        *-*-darwin*)
                if test -f /sw/lib/libexpat.a ; then
+                       # libexpat installed via fink
                        EXPAT_LIB=/sw/lib/libexpat.a
                          AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
                          AC_SUBST(EXPAT_LIB)
                fi
+               if test -f /opt/local/lib/libexpat.a ; then
+                       # libexpat installed via macports
+                       EXPAT_LIB=/opt/local/lib/libexpat.a
+                         AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
+                         AC_SUBST(EXPAT_LIB)
+               fi
+               if test -f /usr/local/lib/libexpat.a ; then
+                       # libexpat installed from source
+                       EXPAT_LIB=/usr/local/lib/libexpat.a
+                         AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
+                         AC_SUBST(EXPAT_LIB)
+               fi                              
                ;;
        *-*-freebsd*)
                if test -f /usr/local/lib/libexpat.a ; then